From: Alan Third <alan@idiocy.org>
Date: Mon, 24 Apr 2017 09:23:28 +0000 (+0100)
Subject: Fix XBM colour rendering in NS port (bug#22060)
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~21^2~1546^2~562
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=53f8f4bf2db097f4a2c68194c55a87c5a1176c8c;p=emacs.git

Fix XBM colour rendering in NS port (bug#22060)

src/nsimage.m (setXBMColor): Fix calculation of xbm_fg.
---

diff --git a/src/nsimage.m b/src/nsimage.m
index cc8abf76094..e87da77ccf1 100644
--- a/src/nsimage.m
+++ b/src/nsimage.m
@@ -302,7 +302,7 @@ ns_set_alpha (void *img, int x, int y, unsigned char a)
           planes[1][i] = gg;
           planes[2][i] = bb;
         }
-    xbm_fg = ((rr << 16) & 0xff) + ((gg << 8) & 0xff) + (bb & 0xff);
+    xbm_fg = ((rr << 16) & 0xff0000) + ((gg << 8) & 0xff00) + (bb & 0xff);
   }
 
   return self;